Remove intermediate cruft from applyUnapply; more keywords