This is great! Thanks so much.
Just a word of caution: A number of things have changed on the oacs-4-6 branch, and we're making still more changes just these days (most likely they'll have to go into the 4-6 branch), so there will be some significant merging to be done when we merge oacs-4-6 back to HEAD.
Things are a bit shaky these days, waiting for the big merge. It would be good to get it over with.