Don't require adapter classes that are already available

Fixes #1 and fixes #2.