Reconciling with paper semantics; various fixes.