Cleanup a couple of singleton-in-branch warnings.