The structure of the source tree is basically correct and this is about as far as we can go without hacking at the C code.