Fix up more user.foo -> user.participant.foo

This is based on an ack. Clearly we need more tests. :(