Looks like a tried to refactor a whole bunch of stuff in 0.2.4 ("ooh, let's try Enums!") so it will take me a few days to sort through it.
