These are some cosmetic changes from upstream commit b12d2b75: Drop
PHP4 support. No functional change.

Released under the Affero GNU General Public License (AGPL) version 3.