Unified draw and stepComplete logic a bit.