Submit missing parser changes from a previous parser refactor submission