Remove unnecessary typedefs.
Switch to C++11
Perform explicit conversions.