Fixed tokeniser and declaration parser