Personally I would say that instead of removing it entirely, I would just re-classify EMS/Fire as purely City workers as opposed to government that way they do not fall under 3.2 as;
Becomes VOID only in circumstances of them witnessing and that way Police cannot charge the medic under 4.4 and...