Fixing differences between shifts and goto tables.