Cleanup parser, redefine with const arguments