Factor master more clearly into master-and-slave