Typed data, more unrolling