Minor simplifications to WebVariablesMap and WebContext