Decomposition into terms (#849) - Basecamp