Fixing comments from jkeiser.