Editorial: align with Infra

Make several improvements:

- Stop using "then" before nested steps.
- Start using "then" after an if conditional.
- Use camel case for variables (codeUnit, not code unit).
- Stop manipulating state and initializing variables in a conditional for nested steps.

(More needs to be done, but this also needs to be reviewable.)

Author: annevk