Improve token_and_options regex and test