Apply fixes due to change in functor grammer

Apply fixes due to change in grammer for functor (for more information refer to Rec!2747 (merged) particularly this discussion)

Should go with Rec!2747 (merged), Analysis!867 (merged) and DaVinci!654 (merged). FYI: @graven