[PATCH] Don't create temporary lists if not needed