Sources say Johnson is close to solving one of the thorniest problems in the “big, beautiful bill.”