Simplify record_marker_adjustments further
Incorporate Stefan's feedback.