NDL & National: various minor style changes.