More low-hanging-fruit cleanup.