This way we can make more of the store fields and types private in follow up commits. This is not a functional change. Signed-off-by: Tom Gundersen <teg@jklm.no>
