Some small more-or-less cosmetic changes.