Progress towards maker support.

Lots of stuff here that needs to change.  Some old code that
wants to be deleted from R/ still.  And the main splitting-up
of the angio data still needs doing.  That's something that maker
really doesn't handle yet, so expect a hack.