Use correct concat::setup include.  Cleanup per new Rakefile.