...Including making a lamp with multiple light sources,...

YES! That is a wish I have mentioned before. A light source should be connected to a material and not to the object. I don't think an implementation would be too difficult but there is a huge problem: backward compatibility with the current light sources. And I don't know how photo renderers handle the light sources, there might a problem with light sources connected to a material and not the object.