OK, done. We do this already for `ncf` anyway.