BS-6650, code review: trivial changes