Now that fallback system is fixed, use it for every collection type (bug 915803)

Also fix tests.