CDI-44, remove overlap with Unproxyable Bean Types