Minor tweaks and cleanup.