This check is the result of a design decision taken long time ago. I think that adding another "special handling" would just complicate things. I agree that the workaround is not perfect, but it's just a workaround after all. We could ask the CDI EG to get some more feedback on this.