Merge to XFA: Cleanup: Fix some unused-function warnings.