Quick cleanup points to address comments in last CL.
Quick cleanup points to address comments in last CL.

getguesstimate/guesstimate-server,getguesstimate/guesstimate-server,getguesstimate/guesstimate-server