The latest version of this code is in the branch jit-lock of https://github.com/jech/wanderlust It applies cleanly to current head. -- Juliusz