Refactor cf-bindings.  Still figuring out organization.