Renderer2: cleanups, refs #321