More minor changes melded across (before the big stuff).