When we had the then-small-fanperson baptized, we did it as a separate ceremony with no Mass. Granted, she was five, which is unusual for Catholics, but it did make things easier.