Handle some more cases for proper code iteration.