Restructure slightly, eliminating some repetitive source lines and making GEOM patches simpler and more readable at the same time.
Restructure slightly, eliminating some repetitive source lines and
making GEOM patches simpler and more readable at the same time.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase