Draw ctx refactorings

Mostly just mechanical cleanup to prepare for porting the whole draw ctx

I think last patch has a bug, but test pass and I am not quite sure how it should be done (I will add a comment to the relevant line)