Cleaning up some old branches that never got merged. This one actually seems useful. It was done by CW a while back.