cleanup form type resolve and support indexer; provide weak completion icons #282