Work around trunk having dependent goals

Since [instantiate (n := ...)] is deprecated in trunk, we shouldn't use
it.