Reformat FEN construction

Simplify and shrink code.

No functional change.