Simplify use of adapters, given there is only the default
This makes it simpler to implement the per-change adapter later by clearing away some existing mess.
This makes it simpler to implement the per-change adapter later by clearing away some existing mess.