Merge "Initialize functions as NONE in legacy handler."