Drop expandRepeats from places where it's no longer used