Cleanup some ExprVariable stuff