Parser.php cleanup #28