Another round of E_STRICT fixes

See: cakephp/cakephp#1623