Use the correct mask function
Prepare for the fill+stroke case
Initial support for stroke+fill at once
Do not cleanup twice
Add the non zero case

Make sure to free the stroke buffers