Solved MSVC 2008 compile error, workaround no longer needed
Solved by implementing custom Pair class.