Reorganise to save a bit of space.