Some code cleanup related to Forwardable.