More consistent quote/doublequote usage