Completely remove use of 16-bit values in calculation of EV