Merge changes Ied888249,Id8857c45

* changes:
  init: check the arguments of builtins during the build
  init: don't log in expand_props directly