Re-arranging feature specs for legibility

Instead of having the let and before clauses clutter up the earlier
part of the specs, I'm moving those declarations lower.