Move some parsers around to allow access to the param parser