More work towards new rendering management.