A bunch of minor modifications, mostly stylistic.