Unified builtins2

OK, I actually added ```addAllThenSimplify``` in my pull request. I will change to use that method whenever possible later.