Add support for for of and ++