[sr-dev] git:master:a0f09749: registrar: reformat exported structures