I think there's a bug in my patch - on further reading it seems "-jar"
just controls the interpretation of the first non-option argument
rather than taking an argument itself...
If that's the case, the test for -jar or -D* should remain unchanged.
Cheers,
Olly