Used structural binding to shorten some loop setup. The generally useful clean-up I did while trying to get layout call hoisting working.