I hate breaking changes, but I think this one is worth while before it becomes harder to change.