SWRL tokenizer fixes