Simplify draw-entities even more