A simple refactoring to move more runtime dependencies out of the parser and
into the river.