stop using 'apply' rather than map

Ah, yes, last legacy of a phase when I thought apply was a newer, kinder,
better map...