Minor CR feedback addressed.
Simplified ownership code for continue/break statements.