Bug 415582 - further debugging assertions