Maybe we should take this upstream then? I don't know how valuable it is to keep a divergent fork of klib around...