Commit 00f62b60 Further renderer refactoring: another 80 lines down Not get a good day to be redundant renderer code.