Final (?) cleanups for simplified VariableTree syntax.