Kibit cleanups.

All cosmetic changes.