prototype: Simplify types for ProblemIds.
Merge branch 'master' into prototype