C++11

Removing annoying merge chars.