A few small cleanup changes.