Removed the specialization in the std::make_pair calls as requested by authenticate.

I also fixed two comments.

It should help in making Valyria compatible when compiled with VS2012.