Remove reference-collapsing overloads of ref and cref.
Merge branch 'develop'