Major fix for 'for' statements allowing expressions