FORGE-1155: Applied OptionCompleter changes