Misc housecleaning.