Some code cleanup related to Forwardable.
updating latest for Pull request