More minor cleanup.
More minor cleanup.