More clean up of literal handling