Some cleanup; make for loops over subdirs less noisy, more informative.