simplify catalog format

also own that XternDef only has two kinds of things, instead of like 8.

Code is also shorter.  Test will be fixed in next commit.
finish catalog conversion

now harness tests pass.
small fixes to comments

leftover from "improve comments on plx catalog objects" CL