Reorganize slightly.
Point explicitly at the wrapper for now.