Update functional, unordered from master.