Cater better to underquoted callers