Yeah, I'm worried about him choking, too.
We thought we had his room baby-proofed, nothing he could choke on, yet the other day he managed to find the one thing in the room we missed that he could choke on, and had obviously been in his mouth. I was so glad I got it before he DID choke on it.