Refs #6634. First cut at adding normalization.