Total rewamp of grain local calls stubbing