More re-aligning of parameters.
WaitSlavePosition is now RPC only.
Master position and slave position now use RPCs.