Minor code-cleanups.