design: simplify mark termination and eliminate mark 2

Updates golang/go#26903.

Change-Id: I8b0fd619282f148db2aa3d4e0a18be9f3241d392
Reviewed-on: https://go-review.googlesource.com/128896
Reviewed-by: Austin Clements <austin@google.com>

Author: aclements