Preparation for models for co-inductive datatypes. Minor cleanup.