More clean-up.  Minor mod to scons build script.