Small parser changes mainly for debugging