This means less changes for sure. I can't see any other places where we would need to use this mutex, so this seems like a good plan.