Merge "init: do expand_props before calling the builtins."