Add support for watching std::map variables;
Fix a bug - the expand action will fail after a collapse for pretty printed value