Add another level of type unrolling