core: simplify mutex signatures

Fixes #1436
Ah, I missed the plural in your previous comment. :)