Clean up a few utils and some STL stuff.