Clean up hash vs ref resolution a bit

* Fn names are a bit clearer.
* Fns do a little less.