Small fixups and leftover cleanup.