Fix the handling of expiry times when modifying roles.