core: simplify mutex signatures

Fixes #1436