Refine code. #1665

Job	Run time
multiple-arch-armv7	21m 54s
utest-regression-blackbox-test	9m 30s
multiple-arch-aarch64	22m 52s
cygwin64-cache	1m 55s
cygwin64	14m 54s
fast	1s
build-ubuntu16	3m 5s
build-centos7	4m 52s
build-cross-aarch64	5m 12s
build-ubuntu18	3m 8s
build-ubuntu20	3m 32s
coverage	3m 35s
multiple-arch-amd64	2m 26s
build-cross-arm	5m 21s
test-done	1s
	1h 42m 18s

Provide feedback