Suffolk Legis. Kevin McCaffrey is altering his plan to expedite the merger of the county treasurer's office with the comptroller to eliminate the chance that the county could end up with an elected treasurer in November who could serve for just six weeks.