Inexcusably huge commit reworking style and some primitive choices.