NOR/CFI: minor code cleanup