Some small tweaks/cleanup.