Small fixes.
Optimize the ConvertToRPN method.