Minor improvement to onTake()