A bit more cruft clobbering.