Merge "init: Simplify struct BuiltinArguments"