Make a few changes I've been musing about.