Move towards less mark-unmark in regex; failing tests so far