Re-implement the binder-swap stuff in OccurAnal