Fix the type definitions for pre and post conditions, fixes #740 (commit: e5b2e9f)
Use re-stated types in definition imports (see #760) (commit: bd2643b)