Style fixes for reviewed-master