Refactor markers

@springmeyer - all visual tests are passing apart from 

```bash
"text-bug1533-600-600-2.0" with agg... ✘ (245 different pixels)
```
I can't see any noticeable difference, can you?