It appears to be working at the moment on the tree. I will go back and look at the models. Not sure what is more trouble to set everything up in a layers list then unassign domains etc... or reassign individually. Not great choices. :( Having a layers list does allow you to save an easy preset tho. If you could group shaders you should be able to do this also.

No need to think outside the box....
    Just make it invisible.