Final fixups from review including errant tabs.