More work converting to using ShadowRenderer