Remove ceremonial layers of indirection; revise registries; update test cases