Got rid of EXIT_OR_RETURN() macro again -- switching to a better