Another try cleaning up Party

Don't inherit things from party.  This is slightly less elegant but a
lot simpler.