Add code for non-covariant build.