Other little work on the parser