I've attached for reference patches that achieve the improvement. I'm now working on further testing of these patches and will push them upstream if functional testing passes.