Tidy and comments.
Simplify parsing Metas of type ACCOUNT.
Tidy/resolve FIXMEs.