Another bunch of rewrites for MSCPDFReader