prereq-build: g++ formatting and consistency fixes