So, what do you think? Should I go ahead and cleanup and commit the
patch I made earlier, with the side note that it needs to be tested,
or should I wait to test it first?
As I said, it doesn't actually break anything that worked before; at
worst it will not do what it's supposed to do.