mop: Rearrange a bit.