Replace two more 'return' statements with 'next'