Switched to better function equivalence check (by pointer instead of by name)