Cleanup init-deferred
Cleanup; sections; fix stale description
Whitespace
Fix yes-or-no broken by earlier commit