Ensure var-quoted handlers and handle all options