Match the Format API as just updated (untested)