If we skip BC we can just replace all that options keys juggling and only use closures.