HDFS-5612: small code cleanup.