Make draw modes slightly more versatile (#165)

* Improve lifetime versatility of drawing.rs

* Undo breaking change, to be addressed in a separate issue

Author: AmityWilder