Sharing some more code between the SCM plug-ins