Reduce some logic redundancy in clearRect/fillRect code for Canvas...?

Still some left, but unavoidable...