Expression fixes
Merge branch 'expressions-fixes' into PHP-5.6