Small restructuring before merge.