Simple answer - swaddle until it doesn't work anymore! haha.

I wrapped DS until he was about 7 mths, and DD until about 15 mths I didn't have to wean, it seriously just didn't work anymore, and they were getting themselves out of the wrap anyway by then.