Fix typo
Merge branch 'master' of github.com:dallingham/regenerate
merge resolution
Better preserve register name, drop reserved fields