Inline for loop step code into continue statement.

Also fixes bug #201