Remove redundant definitions to appease tinderbox.