Remove some redundancy in the top-level production.