Nat edit (GO) work-in-progress.