Use new constants.