Revert "Miscellaneous PHPDoc and parameter mess cleanup."

This reverts commit 12f5add81e84dae5a23c27037aa3fbde9a2240a1.