The Second Amendment, and Trump’s promise to strengthen it, is becoming a major issue in the work on the legislation, which Republicans hope to approve by July 4.