Patch for PHP 5.4 (store criteria aliases separately from now)