Change the various "return -1" to "break".  Avoids Coverity error and
perhaps other/future analyzer issues.