Attempt to fix spurious errors in the PC test suite.