Simplify fix of fish's type builtin