Since 2.0 doesn't have to be backward compatible, this is the point where we can make these changes. That being said we can bikeshed over the exact format of things later :)