#adapter_info{}, and a minor cleanup.