I'd move both of these to the end of the enum to preserve ABI.