Reviewed and applied patch from #4004. Removed one ", which" change since the resulting change made the trailing clause read as if it applied to the wrong type.