Editorial: break from the inner invoke loop rather than returning

Editorial: break from the inner invoke loop rather than returning #556