Fix incorrect extraneous quoting (issues #34 and #37)