Neutralize more variable and literal types