am d67ff2d5: Merge "Move ls implementation detail into ls."

* commit 'd67ff2d507add84a4d958bc19657e88d4689b92d':
  Move ls implementation detail into ls.