This should be the last batch of internal clean-ups before the "real" work. I should be able to send some cleaned up uniform rework patches (as discuessed at XDC last month) next week.