Changes needed to move towards lazy evaluation of primitives.