Pre-emptively fully-qualify all ref names
Replace post-hoc ref qualification with assertions