Prep for further work. It was silly to use a loop on a static array of two elements. Closes: #1760 Approved by: jlebon