ada: Fix expanding container aggregates