Yup, it got out of sync with my fork. Anyway, you seem to have a good solution now, so I'm removing this one.