Rename x_orig to xOrig

As suggested by golint. Underscores aren't very go-ish.
Replace zero-length slice with nil

This avoids an unnecessary call to make. As suggested by the new golint.