use S_OR where appropriate, comment an unclear difference in format