If you change that function, perhaps do it in a separate PR so it's easier to accept.