Uniformly cleanup enums & numbers

If the Chunk will be enums, nuke all the numbers.
If the Chunk will be numbers, nuke all the enums.