CompletionContributor: cleanup, notnull