A bit of cleanup and comment stubs.