FIX: issue #522 (Tokeniser chokes on nested curlies)