Remove call to 'last' when resolving enumerables