MDL-39833 format: tidied up API improvement to allow for future backport