Small refactor, prep for parser cleanup