Makes sense, but quick look at code seems like it's being done almost nowhere now. Should adding it be separate pull request / issue to keep the work clean?