Fixed options parseing when given empty strings.
Speedup on placing file markers.