Yup, that's how you handle AF. Treat them like who they are, not weaklings or dummies, but successful characters. Puck fits as the 'can't lose, cares too' guy who has a sense of humour about most everything, but handles things that need handling.