Talked about that with @weierophinney @ZendCon today, would be a BC break. So, I propose a first "non breaking" PR followed by another with these fixes.