Make sure these are handled in the same way as the generated JSON.