Fix invalid refs to constants introduced in 681dc4636d4ec009870fbbf99fd00ff538c97ed4