So I’ve cleaned this up, with a slight change to the semantics of LockOptions.overlay(), so that alias-specific lock modes are overridden on a granular basis. This is more natural and less fragile, though in principle it’s not 100% backward-compatible with H5. But I think the probability of actually breaking anyone’s code is tiny.