Hoist an option upwards in the grammar. No functional changes.