A little bit of naming clean up
Add dependencyOnBuiltins() fun
++
Builtins serializer uses new API