I have started to eat my own dog food!
Corrected a crasher in the jj expansion logic.