HDFS-4249: more random cleanups