@nden @iguananaut What do you think? Should I assert the current string format here or remove the TODO?