Alright, will be done as part of the move to the `Parser` class.