GDS-1322: more cleanup / check in ensureAvailable0.