Moving the site-specific stuf down (later) seems sane to me at least.  Has this been tested on both the UWA and Stanford code paths, @dglance?