Cleanup of name clash checking.