Spike: Clean up argument parsing/routing
Rename 'router' to 'command-wrapper'