Just use constants directly

MSP-11673