I think this would be a major change, and while I agree, I'd rather merge this and fix some of that up in future pulls.