I don't think so. I agree that we should avoid changing CMSIS when possible, but I talked it over with @solidgoldbomb and this was the best we can do. It's a bug in CMSIS.