Merge "More consistently use refersTo()"