Fix issues with for-in and for-of.