Almost finished C++11 transition. Need to fix argument forwarding.