[RCPUB] A little more work on the upgrader.