Some little bits of cleanup.