Hardened arg parsing code some more
Forgot to remove old ReplacementGenerator typedef
WIP