Improved param lexing.