Patch a sqlcmd LoadProcedures regression, a few tweaks, some from r=chris