Additional patches to the -b option in substitute.pl