Revert "Undo doc popup change"

This reverts commit d9d809abae1a555164dfb30c27b3c78894aaf60e.
Don't make completions with nil