Bugs in dirs-for-each fixed.