I went ahead and changed this, since I was making other changes anyway.