Escape populated values by default

There's probablya better way to implement this, and I didn't update the tests out of laziness. :)