Very nice use of the unit test to explain the purpose of this whole PR!