Crunching some more stuff into `Parser`