Keep model state consistent with the executable, and stop dropping compile-time inputs

Keep model state consistent with the executable, and stop dropping compile-time inputs #2528