Style fixes in and near recent changes