Rectify with non-terminals