Abstractions XDOC, plus some interface cleanup.
Fix broken tests.