Move some stuff around.

This also fixes a problem for filter-flow-release-start-version, when a
release was started teh wrong version was created.