Fixing bugs in the PHPDoc changes I made.
More code style cleanup.