Ignoring the plural form of "reply" for renames is dumb...

[ci skip]
Big batch of phpdoc improvements and minor code styling fixes.