Remove one layer of indirection when rendering
Remove obsolete comments