Trying to make the references to genie-common source sets a little more flexible