The previous port to the draw function was a tiny bit incomplete. This
patch should fix the remaining issues and remove unused variables.