Some more progress on Coq (Prop) part.