A few more changes to analyze ns forms like any others