More cleanup after a second pair of eyes.