Tidy up drawEllipse usage and options