[dev] More progress on funct -> funct11.