Simplified expressions for links and list commands.

As per emiln's suggestion, needless use of match has been removed a couple of places.