BF: Fix issue with lstat being called when not needed.