rename macro.literal to macro.str

because it was confusing; atoms are literal as well.