Improve wording.
Add support for DatedFormula.