reorder fields in maps to be syntatically correct.

[ityonemo]

atom colons must come after hashmaps.

also, while we're at it, make sure that requireds come after optionals.

[ityonemo]

fixed in 0a85214