Fixed up botched merge of constants