Fix NON_ARRAY_TYPE so it can be used at both places.

Perhaps should split it up into two..