Address bthirion's comments.