Issue #473:
- Reworked code generating markers to be written to fix restart when
  using static geometry