The refactoring suggested above should eliminate this.