Fix some strange qexpansion anomalies...