Misc scons cleanup.