Minor cleanup of marker flags in TimeStep