Tweaks to be more standard C++.