Make --ls option branch more idiomatic