Improved RPN support.