WELD-1503 Refactor metadata structures supporting bean interception