Minor tweaks/cleanup.