Modifiations to NodeBuilder interface

Give buildObjectNode() and buildVariableNode() the current nodeMap so
they can look up their ObjectType and VariableType if necessary.