Update to use new River Trail submodule and new extension interface.

Plus a few other cleanups.