Made this change simply for easier debugging.  Plus the comment association is better.