Applied the changes I came up with sketching yesterday. Not that they're finished, of course...

659422