apply x/tools/modernize fixes #5661

Job	Run time
prepare	1s
test / prepare	2m 11s
test / run (containerd, ./frontend/dockerfile, integration)	5m 16s
test / run (containerd, ./frontend/dockerfile, dockerfile)	7m 2s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	5m 15s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	7m 3s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	5m 12s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	7m 10s
test / run (containerd-1.7, ./frontend/dockerfile, integration)	5m 16s
test / run (containerd-1.7, ./frontend/dockerfile, dockerfile)	8m 2s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	5m 22s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	9m 51s
test / run (oci, ./frontend/dockerfile, integration)	4m 43s
test / run (oci, ./frontend/dockerfile, dockerfile)	7m 1s
test / run (oci-rootless, ./frontend/dockerfile, integration)	4m 51s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	6m 3s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	4m 44s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	6m 13s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 47s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	6m 9s
image (mainline)	5m 38s
image (labs)	5m 38s
release	0s
scout	0s
	2h 3m 28s

Provide feedback