Merge pull request #3016 from lewurm/small-arm-cleanup