More tiny cleanups.  Got some more to go.