Port modification revision to non-recursive mutex

Instead, hoist the one function that requires it out into a helper
that operates on a locked mutex state and verify that is the case.

While at it, also remove the global static for the mutex and instead
use a function-local static that gets initialized on first use.