> Anyway, I've committed the attached (slightly tweaked).

Doh! Try ...