Tweak some async stuff

SiteParty needs rethinking: duplicate values.  Obvious answer is party trait and WrappedParty stuff but, bleh.