Reorganizing DoubleHolder etc.