Refactored variable contexts, and fixed variable rewriting.