@kring is there an easier way to test this?  Perhaps by using part of my command changes to check for the layer as the command's owner instead of explicit uniforms?