Removed evaluator mechanism and assumes only constant or vm defs