Keyword 'end' moved to the correct list in syntax highlighter.
Move token resolution to plan building

o Write tests
o Add Materialize.mapValues
Ensure Map.mapValues gets materialized immediately everywhere

o Introduce helper Materialized.mapValues for this purpose