More design rationale improvements.