Some updates of recent Func refactoring.