Rewrite of 6.3 Concurrency

Cherry-pick against master of concurrency changes from @paul-esch

Also shortened long lines.