Clean up the parser and specs