A couple of cleanups.