Minor cleanups.

4 jobs for mmm5 in 10 minutes and 28 seconds (queued for 1 minute and 52 seconds)