parser: cleanup some todos and simplify some things#548

kodiakhq[bot] merged 1 commit intomastersbdchd/squawk:masterfrom

steved-cleanup-parser-simpliersbdchd/squawk:steved-cleanup-parser-simplierCopy head branch name to clipboard