About the cowboy comment, that's what version control is for. Just modify in place and then stage hunk by hunk with magit or git add -p.