There are probably others, too, but I'll leave that to someone who has verified those -- it can be added in a subsequent commit.