Contrary to what the previous commit message said, we do actually have more cases...