This is a continuation of the thread 
  https://lists.gnu.org/archive/html/emacs-devel/2023-04/msg00206.html
, where João suggested we should proceed with my simpler patch until we
hear from Alan.  This message summarizes the current situation:
  https://lists.gnu.org/archive/html/emacs-devel/2023-04/msg00339.html

I tested my patch with Sebastian's ada example.

Thanks.