'.var' now works for expressions, cleanup