Modernize C++.

Fixes compiles with newer compiler toolchains.