Oracle: Temporarily solve the problem with passing decimals to and fro without conversion
Use primary instead of alternative tokens for operators
Correction to pull #75