Match more varied interface names.

Apparently ethernet interfaces can still be assumed to start
with the letter 'e' and the rest is all over the place now.
remove dead variables
document -x option