Reworking SceneTarget functions to handle area lights.

Area lights are tricky because they need to merge geometry and a light source, which are currently handled separately.