It would probably be nice to squash all of this together. Also, please add a little note to the commit message saying how to handle translation errors turned up by the canary. Other than that, I guess this is a pretty good solution to an unfortunate problem.