NMS-6683: 2 slight readability improvments