Ensure we don't gsub on nil
Ensure we can use symbols for type_name