Move various sugar specific bits to vars