Dave and Elwyn review

Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Elwyn's suggested change for READDIR

Signed-off-by: Tom Haynes <loghyr@primarydata.com>