Fixes an issue in mutex where argument names could overlap and cause a failure during rewrite
Merge