Wrap up sync master param setting into one convenience function where possible.
Clean up the diff
More x2 /2 cleanup
one more comment