Clean up the draw loop a bit.