Cleaned up OS'd version of some of our internal helper libraries.