minor refactorings for readability
[git-p4: depot-paths = "//src/hoe/dev/": change = 8520]