Patch some more cases of throwing a string to throw new Error(...)

Try again using a separate branch instead of my master branch.