Improved handling of not excepted syntax.