Clean up some sloppy snippits.