Finish catching up with current gmetric calling convention.