Remove more instances of hasMultipleRefs
Remove usages of hasExactlyOneRef

Currently untested