content: CompletionResult is now Type.
net: Minor code tidy