Make function calls more obvious
Implement `-x` and improve display of `-l` options.