More trivial cleanup.