Misc cleanups to PR testing.