Remove unnecesary use of uint16_t in calculate.c
More work on removing use of 16-bit values in EV calculations.