More extensive use of the NOBR macro + code clan-up.