Consistent Expression API.

Resolves https://github.com/cakephp/cakephp/issues/5339

completely BC