Improve options handler.