Tweak PDB re and add tests.