Simplify uses of `resolve-refs` partial.