NOR/CFI: review scope of functions