Make the scons build files simpler and easier to understand and maintain...

All the SConscript files have similar edits.