Some cleanup; type synonyms and plain declarations. Terms are not extracted yet.