Simplify RA interval code and adapt to RFC 4961 errata