Minor tweaks, cleanup.