Make it compile under 1.5 again...