This fixes a couple of issues in which the single-precision
float value for pi was being used in computations involving
double-precision values.

Change-Id: I4a34f93a2b8093e95d744334f795e1ff2f7951a4