Fixing comments from prior conflict.