Last of easy fixes. Lots of type plumbing still needed.