Use -> instead of ->> where we can; #2101

Still squirrelly, but a little less so ...