calc: make calc a little less kludgy

Signed-off-by: Peter Williams <pwil3058@gmail.com>
bootstrap: prepare to retire bespoke implementation in favour of bootstrapping

Signed-off-by: Peter Williams <pwil3058@gmail.com>