Ta - the existing formatting was all over the shop. Will do a formatting commit to fix it up, separate from this one.