Sounds good. Yes the treatment seems to vary by broker based on the posts here, I happen to hold some FHLBs at Vanguard that they report as Box 3 so I didn't hit this issue.
