Improved context options handling.