Modifications to various SConscript's to fix bug in cleanup option.