Refactor scene drawing a little.