Are these (and some related tags) all still necessary? It looks like the enum should be automatically sized so this shouldn't be necessary?