A good question. Because I thought this PR might be on the large side I'd started out with a make-minimal-change mindset, but re-writing this section to always use biggus makes it a lot simpler. :+1: