Clean up expression annotations.

I've temporarily removed L.K3.Analysis.Conflict, pending further
discussion on analyses.