Further tweaks to improve handling of small collections