Additional patches to substitute.pl's handling of alternative folders spec'd with the -b argument.