Convert TemplateExpression to use the new VariableMap instead of a Map

Change all test code accordingly. Mark old expand function in URITemplate as
deprecated.