Move 'then'
Fix 'do ~ done'