Remove useless reference operator.
Remove remaining reference operators.

These were left over from the days of 1.x and aren't needed anymore.
Merge branch 'master' into 2.4