Sleepytime Wrestle

We have been swaddling C since he was born because he had a tendency to flail and hit himself constantly. He loved the comfort of the swaddle until recently--now, he must be playing Baby vs. Swaddle because more often than not we find him like this:

So we have tried to put him to sleep without the swaddle, but he does not sleep as sound, though he may look like he does:

"Not while I'm sleeping!"

Meanwhile, C sleeps and Scoob maintains his post under the crib: