ada: Further cleanup in finalization machinery