Issue #2416: refactor renderer