Don, your points are well taken. I'm not trying to do a major overhaul of the SDM, but since we are tracking the 3.2.x and 4.x trees on the current SDM and will be doing so for a while, we might as well make our lives easier (I have a personal interest in this since trying to match patches and closing bafs for 3.2.5 was not fun).
As you noted, the changes are simple, and it should only take a few hours to get them done and tested. Then, rock on 4.x ! :)