Fix a problem with user space build failing when building just for a kvariant.