Switching from `-c` to `-e` sounds like a nice trick, but it's not at all clear from your commit what effect this has.  Please can you provide (much) more detail in the commit message to help us review this?  Thanks.