Hammerhead: Hopefully the last of the fixes for unused-parameter