Some minor refinements to generic-resource-api