Improved options handling.