This just changes the arguments passed to build_properties() and moves
that function around in the source file. No functional changes are
happening.