OP-1235 cleanup "magic numbers"