Patch by Tomasz Kuchta that fixes the fragile way in which KLEE and Kleaver options were shared.