Style fixes

r @zsweigart