HDFS-5616: more minor clean-up