Slightly simplify MapParser constructor
Add StringRefStream