Fix performance regression after OPTNONE changes #271

Job	Run time
coding-style	11s
host-arm (armv7, none, none, g++-10)	3m 35s
host-win-msvc	55s
host-arm (armv7, none, none, clang++-11)	3m 48s
host-win (x86_64)	59s
host-arm (aarch64, none, none, g++-10)	2m 48s
host-x86 (x86_64, g++-10)	2m 26s
host-win (armv7)	57s
host-arm (aarch64, none, none, clang++-11)	3m 27s
host-x86 (x86_64, clang++-11)	37s
host-win (aarch64)	42s
host-arm (aarch64, crypto+crc, none, g++-10)	2m 46s
host-arm (aarch64, crypto+crc, none, clang++-11)	3m 28s
host-arm (armv7, none, -mcpu=cortex-a32 -mfpu=neon-fp-armv8, g++-10)	3m 26s
host-arm (armv7, none, -mcpu=cortex-a32 -mfpu=neon-fp-armv8, clang++-11)	3m 40s
test-win-msvc	52s
	34m 37s

Provide feedback