Use separate option sets for each file contingent on its directory.
Minor refactoring.