Fix unused parameter warnings introduced in earlier patch