Update - My return ACCEPTED last night with only the address/payer tweaks mentioned above (and the replacement of an imported 1099r w/ a hand edited one. All amounts and acct numbers remained identical. Happy day.
