Streamlined wranglers.

Removed most class variables.