Give up on wrapping covers for now. Fix scoping.