I decided to stop trying to make my return perfect and just filed it with the imported data as is. Not worth the time to polish Schedule D until it was shiny.
Fed & CA accepted it, so far so good.
