Good point. We can consider aligning this in the rest of the code base, but some are SPI contracts.

> So I think it would be more important to align...

..but a different concern than merging this. Fixing this issue is the priority now and I'd like to address one problem at a time. I hope this unrelated concern didn't prevent you from merging this pull?