pstore: fixes types, treat it as a collection#2806

ksss merged 2 commits intoruby:masterruby/rbs:masterfrom

HoneyryderChuck:pstore-fixesHoneyryderChuck/rbs:pstore-fixesCopy head branch name to clipboard