Some minor cleanup and fixes to the anal/var thing