Undo original type arg change to CheckFunctionReturnType after refactoring