Reworked the goal activation checks *again*.  Seems to be working much better, again.