Rearrange things to undo eclipse broken-headedness.