Fix for trickle between SetRemote and SetLocal. Fixes #181

Can these be const?