Even more removals of '<>'; I can hear Barry shedding a manly tear ...