Minor SCons cleanup