SConstruct cleanups.