Better logging; ensuring quote encapsulation.