Clean up lock-fail for both elsewheres; #606