comm: Break out common code in comm