[PATCH] Rearrange a few struct request members