Avoid querying for a site when we don't need it

Not that this was a performance killer or anything, but it did generate a lot of unnecessary trips to the database.