A few code-cleanup tweaks