[hughesjj]

This is why one pager/two pagers also exist, but agreed doing it for every piece of infra glue would be excessive even for a one pager.