Add form_context & tree_context references.
Fix repeated attributes.