Minor clean-up in metrics servlet code