Bug 1066659 - Try harder to match nunbox payloads with type allocations, r=jandem.