More dynamic_fmt valid() fixes. Still passes Test Suite so should be OK.
Merge branch 'unstable-jumbo' into bleeding-jumbo

* unstable-jumbo:
  More dynamic_fmt valid() fixes. Still passes Test Suite so should be OK.