All constants refering to CFAs are now labelled as such.