Small refactor of draw/update interface.