merge the types [term] and [fmla]
Rename as little as possible and keep the API. Make all the necessary checks in Term and Decl. Remove the duplicate code in Term but keep it elsewhere. We will factorize the code as we go, without rush.
Showing with 547 additions and 853 deletions