This mostly fixes `key-order` warnings around `block` statements.
One that doesn't trip up ansible-lint, causing `load-failure` errors.