GiNaC even more restructured