So what you are saying is that a combined module works for the visibility issues between HV and the HV portable extension, but having this single module plus the above exclude would also hide the portable extension from CDI, right?

I guess we just remove the exclude.