Here is patch #4.  This fixes some Ada regressions.

Tom