Get rid of type on NULL in CASE. Let caller handle this.