General cleanup of that/which/who/whose handling

Add plenty of whichspace to make it clear where the rule boundaries are.
Move around the examples so that they are next to the rules that apply
to them.
change that_adj to that