Added back obsolete quote field for compatibility. Improved code comments.