manually tested on 129.1525
refactoring: language elements merged at one class
added: aggregate algebra support