This is a collection of random changes that seemed like a good idea at the time. Probably nobody but Trike cares about this.