Cleaned up some of that state machine.
Basic quoted parameter support.