FORGE-1155: Using refactored FileOptionCompleter