apply x/tools/modernize fixes #5660

Job	Run time
prepare	1s
test / prepare	2m 10s
test / run (containerd, ./frontend/dockerfile, integration)	5m 47s
test / run (containerd, ./frontend/dockerfile, dockerfile)	7m 16s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	5m 14s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	7m 5s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	5m 48s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	7m 11s
test / run (containerd-1.7, ./frontend/dockerfile, integration)	6m 45s
test / run (containerd-1.7, ./frontend/dockerfile, dockerfile)	7m 25s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	5m 27s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	8m 9s
test / run (oci, ./frontend/dockerfile, integration)	4m 38s
test / run (oci, ./frontend/dockerfile, dockerfile)	6m 7s
test / run (oci-rootless, ./frontend/dockerfile, integration)	4m 36s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	5m 54s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	4m 43s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	6m 29s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 37s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	6m 5s
image (mainline)	5m 34s
image (labs)	5m 38s
scout	0s
release	0s
	2h 2m 39s

Provide feedback