Disabled variable unit changes.

Also cleaned up the expression parser a little bit.