What's the rationale for a limit of 5 ccf and ecf addresses?  Is this backed by some spec, or just a pragmatic view.  If the latter, them I wouuld suggest a higher limit given pj_str_t's are pretty small.  If it's a spec limit then a comment with a reference would be good.