Make the parser already a bit more functional.