Fix Parser for the new variable system.