I think it would be more consistent, but I would really like to get this merged today, so I can complete the work on XD. So maybe we can address this as a new JIRA issue.