Am I correct in my usage of who/that?