Trivial cleanup and slight progress.