Continued cleanup (no rest for the wicked, etc.).