Fixed PDB format handling... again!

Also added a little optimization (move instead of copy)