More work on integrating new rendering code.