PDB Fixes for #528 (serial handling)

Added more hacks to our PDB parser.  It's generally unpleasant to carry around more metadata everywhere, but I suppose it was unavoidable...