Clean up pre-1.5 variables.