Further improvement to address width reduction.