Cleanup of blockquote unquote fix for Yosemite