Update to use new units constants.