More work on generic-infer.