Clean up cmake-command-run &co.
Reorder