Port: Search.Similarities general cleanup