Handle quotes better.