I think we should treat changing the set of numbers you need (from our current representation) as being orthagonal to this PR. Right now we take, and require, everything, so it's always easy later to make some of them optional.