Inline join in ABNF.
Comments cleanup.