Rearrange stuff related to O hack.