Minor code-cleanup changes.
More minor code-cleanup changes.