Quote composite variables

Just in case these variables change or include dodgy characters