Stop using Doubles for Metrics, we only use Int and Long, see ##2177