More cleaning up of cursor drawing