Only call the CFI callback if it was supplied
More callback fixes