Clean data defined code of svg marker
More symbology cleanups