Make Ordinal covariant again #444