Indeed, I'll move the relevant code to a new `Parser` class.