I'm still not satisfied with the Makefile, but this at least makes it converge in a single make invocation again. This also removes the enum value arrays.
