[netcf-devel] [PATCH 1/2] Making changes based on suggestions from Eric Blake