WP-2006: add comments to code.