Minor cleanups throughout.