A wee bit of miscellaneous cleanup.