OSDN Git Service

resolver: fix some previous TODOs, add new ones.