Some  tweaking in the tokenising, ${echo PATH} gets mapped to $PATH, and the $#, $*... crowd are handled better
More diddles with conditional chains