HV-687 Always using type of the current bean when adapting constraint scopes