Yep. `$roleId` is removed as redundant, though it was convenient to have here.