Removed aif macro (and all uses of it from code).