Refactor read_one_org()

See discussion in commit.