Merge "Improve code suffering from PHP 5.3's lack of support for foo()[]"