Whitespace fixes: adhere to PHP code conventions.

A few whitespace fixes; trying to make the codebase lint-free.

Change-Id: Ie259ac88eb6ea1f4490a1bd7bd078eec8e84eae6