Fixes for PHP 5.4.x, 1TBS for else