Patch up SConstruct after the last patchset.