Removed trailing underscores from CSubject*() function using them.
This sort of thing might have been okay if the author was not expected
to use them, but I feel that these functions are indeed usable by the
author.
SubjectNotPlayer doesn't have a "caps" parameter: fixed Mantis 1372.