issue #21836: Fix organization of workflow in vertical editor.
issue #21836: Move some things around.