eliminate some macro helpers and use Context.literal instead