WLS: lots of tweaks to the syntax so that it is now more representative of the what the (new) parser actually does.  Still needs lots of work though.