and Calc is now officially broken.  Let's start fixing this bit by bit...

Change-Id: I383c88245fe1e573666da636c6a8ca8815352ce7