deadalnix Various nits in the parser

Latest commit 09b2279

Apr 16, 2018