Minor improvements to Calc.
Minor improvements to Calc.

osric-the-knight/foam,mdittmer/foam,foam-framework/foam,jlhughes/foam,mdittmer/foam,osric-the-knight/foam,jlhughes/foam,shepheb/foam,jlhughes/foam,shepheb/foam,foam-framework/foam,mdittmer/foam,foam-framework/foam,jacksonic/foam,osric-the-knight/foam,osric-the-knight/foam,jacksonic/foam,mdittmer/foam,jlhughes/foam,shepheb/foam,foam-framework/foam,foam-framework/foam,jacksonic/foam,jacksonic/foam