* Avoid a loop over an array with a single entry

 * Avoid an unnecessary variable shared between multiple
   tests