Throw away the RAII stuff and let the classes manage their resources.