I would agree that you are making these improvements to your firearm to INCREASE your safety and improve your accuracy.
Will it be used against you? Possibly. No matter what you do to a firearm, you should be able to articulate why you made those alterations and be prepared to defend them in court in the worst case scenario.