Minor simplification to WebVariablesMAp