In digging deeper into this PR, I think it will actually help improve readability significantly.