Very minor performance improvement, and latest Metrics version.