Fix #10 and #11: Re-order enum values