On the other hand, no particular rush to merge it, so maybe I'll try to fix this first.