Improve syntax.autotype