When stroke and fill just use the path path. Is it worth it to put the better test here?
LGTM
Committed revision 1884.