Refactored CLine to handle expansion internally, and only hold line.