I ended up reposting my original usps file in order to clean up whatever I did wrong. Then I downloaded the latest patch and published that. All is well. Apparently I was using an old patch.

Thanks for all your help, and Bunyip, I really appreciate your patience!