Code compacting (part 2).