Use the new constants.