Sleeping Attire, Pt. 2

This is a follow up to a poll where I asked how you dress your 3 month olds for sleep. The majority replied that their baby just wears regular pajamas to bed. My 15-week old has just begun busting his arms out of his halo sleep sack. When he does he wakes himself up. I tried the zippity zip but he moved so much in it that he didn't sleep longer than an hour before waking himself up. Would love to hear how some of you transitioned your baby from swaddle to regular pj's. Whenever my baby's arms are free he touches his face and wakes himself up.