Minor code cleanup.
More code cleanup.