Adjusting tokens for 'do' after renaming in place