[MP] Cleanup else and endif blocks in main cmake script.
The requirement for how we were doing this in some blocks is much older than the version we require.