Cosmetic tweaks and code notes.