(#1524) - Plumbing to ensure we only call callbacks once