Separate Quote Markers into options again.
Still better than it was in terms of code, tho