Needs tests for keep_format