| From: Paul Wouters <paul at nohats.ca> | > The code could be simplified (and at least one goto eliminated). | | Done, You just started :-) See 0e00834183923af6209900f36839be3431ddfb09 on hugh-2014may branch. I didn't want to do this to master when we are so close.