More PHP 5.3 compatibility fixes (see issue vatesfr/xo#1).