Move s->rstate to s->rlayer.rstate