Fixed tokenising on commands using string-starts-with?