Tiny arg unpack fix. Remove unused dispatcher.