leave & fleave: Don't say role if it's "person"

And other minor improvements.