Further progress in making the Build Environment sane (or less
insane....)
Tiny improvements in readability and Build Env sanity (!)