Fix redefinitions.