Remove some labels, replacing them with 'NonTerm'.
Authored by: ulrikp 2019-05-17
Parent: [r1323]
Child: [r1325]