The loader and loader-tools projects could do with a round of polish updates before we embark on adding layer (#19697) and index support (#9128).