Yay for alignment, allowing us once again to only move unrelated variable declarations over to C… Part of P0031, funded by zorg.