We want to remove all enum usage, (maybe an eslint rule to ban enums should be enabled?) These two are spread far and wide so might incur a number of changes but nothing too involved. And export them at the top level.