Calc updates

More updates for problems discovered with Calculator.

This resolves this specific issues in this, but the general state of parsing the queries is still pretty dicey.

I also noted that sin(pi) + cos(pi) = -0.999999997, plus some other "precision" related issues, so I am going to give them a think.