Completed most of syntactic expansion