Reduces complexity in NhlGoalWatcher::Goal
Merge