RFC: Largish Cleanup and Refactoring #610

Job	Run time
build (ubuntu-latest)	2m 43s
build (ubuntu-latest, --disable-curses)	2m 43s
build (ubuntu-latest, --disable-lua)	2m 29s
build (ubuntu-latest, --disable-tre)	2m 51s
build (ubuntu-latest, --disable-selinux)	2m 47s
build (ubuntu-latest, --disable-acl)	2m 45s
build (ubuntu-latest, --disable-help)	2m 48s
build (ubuntu-20.04)	2m 42s
build (ubuntu-20.04, --disable-curses)	2m 47s
build (ubuntu-20.04, --disable-lua)	2m 29s
build (ubuntu-20.04, --disable-tre)	2m 46s
build (ubuntu-20.04, --disable-selinux)	2m 45s
build (ubuntu-20.04, --disable-acl)	2m 45s
build (ubuntu-20.04, --disable-help)	2m 45s
	38m 5s

Provide feedback