Change ISWIM implementation to be less crazy.