Fix a few rpn_ that I missed before.