A few more tweaks to SConstruct.