More render agent refactoring.