Fixing a few bugs introduced in the energy interleaving changes and due to
side effects of "continue" statements.
1 file changed