revising recent 'optimization' of expand...