Minor tidy-up.
Disable deprecated PDB procs.
Fixup for no deprecated PDB procs, add IMAGE return.