Fix the ugly passing around of a "parser"

[oleks]

The "parser" is passed around to avoid cyclic dependencies, but it could be hidden inside a wrapper parser monad.

[oleks]

This is related to #5; I'll probably introduce a common parser monad transformer.