Remove gotos in probp.cxx.  Also - move variable declarations
closer to actual use.