Redefinition problems solved.