Fix for adjusting variable-length sizes

When adjusting variable-length sizes, odd things can happen on the encoding boundaries.  Play it safe and iterate until we know the final size.

JIRA-16118