Fix refs, use generator expr