[M] Change in libosmocore[master]: ns2: Improve code consistency