Move an early return to the top of the function.
Add an early return in case an error was determined.
Remove unneeded variables ok and templatePath.
Replace includeSubdirectories boolean with a flags int to merge
duplicate vfs::ForEachFile calls.
This was SVN commit r18696.