checkpoint minor control-spec cleanups