Minor cleanup.
More minor cleanup.